(bug 6099) Introduce {{DIRECTIONMARK}} magic word (with {{DIRMARK}} as an alias)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9169604..ab26607 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -366,6 +366,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 1017) fixed thumbnails of animated gifs.
 * Add APC as object caching option
 * Update to Albanian localization (sq)
+* (bug 6099) Introduce {{DIRECTIONMARK}} magic word (with {{DIRMARK}} as an alias)
 
 == Compatibility ==
 

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index f8b47c3..9829f54 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -90,6 +90,7 @@ $magicWords = array(
        'MAG_BASEPAGENAMEE',
        'MAG_URLENCODE',
        'MAG_CURRENTTIMESTAMP',
+       'MAG_DIRECTIONMARK',
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
        wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
@@ -142,6 +143,7 @@ $wgVariableIDs = array(
        MAG_BASEPAGENAMEE,
        MAG_URLENCODE,
        MAG_CURRENTTIMESTAMP,
+       MAG_DIRECTIONMARK,
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
        wfRunHooks( 'MagicWordwgVariableIDs', array( &$wgVariableIDs ) );

diff --git a/includes/Parser.php b/includes/Parser.php
index a0673a8..1469b80 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2186,6 +2186,8 @@ class Parser
                                return $wgServerName;
                        case MAG_SCRIPTPATH:
                                return $wgScriptPath;
+                       case MAG_DIRECTIONMARK:
+                               return $wgContLang->getDirMark();
                        default:
                                $ret = null;
                                if ( wfRunHooks( 'ParserGetVariableValueSwitch', array( &$this, &$varCache, &$index, &$ret ) ) )

diff --git a/languages/Language.php b/languages/Language.php
index f2485bc..5dab21d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -288,6 +288,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_CURRENTVERSION               => array( 1,    'CURRENTVERSION'                 ),
        MAG_URLENCODE                    => array( 0,    'URLENCODE:'                     ),
        MAG_CURRENTTIMESTAMP     => array( 1,    'CURRENTTIMESTAMP'               ),
+       MAG_DIRECTIONMARK                => array( 1,    'DIRECTIONMARK', 'DIRMARK' ),
 );
 
 if (!$wgCachedMessageArrays) {